Only build im-xim if USE_X11 is enabled s/strcpy/memcpy/ to save a few

	* modules/input/Makefile.am: Only build im-xim if USE_X11 is enabled
	* gtk/gtkrc.c: s/strcpy/memcpy/ to save a few nanoseconds.

diff --git a/ChangeLog b/ChangeLog
index b7e6bdd5c4ee9f3260012fca68edbeafeea2165f..3bf0bfd00fbe3d693f2b73e128fe5df7e636d06d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2000-11-28  Elliot Lee  <sopwith@redhat.com>
 
        * gdk/gdkregion-generic.c: Zap warning.
+       * modules/input/Makefile.am: Only build im-xim if USE_X11 is enabled
+       * gtk/gtkrc.c: s/strcpy/memcpy/ to save a few nanoseconds.
 
 2000-11-28  Alexander Larsson  <alla@lysator.liu.se>
 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b7e6bdd5c4ee9f3260012fca68edbeafeea2165f..3bf0bfd00fbe3d693f2b73e128fe5df7e636d06d 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,6 +1,8 @@
 2000-11-28  Elliot Lee  <sopwith@redhat.com>
 
        * gdk/gdkregion-generic.c: Zap warning.
+       * modules/input/Makefile.am: Only build im-xim if USE_X11 is enabled
+       * gtk/gtkrc.c: s/strcpy/memcpy/ to save a few nanoseconds.
 
 2000-11-28  Alexander Larsson  <alla@lysator.liu.se>
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b7e6bdd5c4ee9f3260012fca68edbeafeea2165f..3bf0bfd00fbe3d693f2b73e128fe5df7e636d06d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,6 +1,8 @@
 2000-11-28  Elliot Lee  <sopwith@redhat.com>
 
        * gdk/gdkregion-generic.c: Zap warning.
+       * modules/input/Makefile.am: Only build im-xim if USE_X11 is enabled
+       * gtk/gtkrc.c: s/strcpy/memcpy/ to save a few nanoseconds.
 
 2000-11-28  Alexander Larsson  <alla@lysator.liu.se>
 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b7e6bdd5c4ee9f3260012fca68edbeafeea2165f..3bf0bfd00fbe3d693f2b73e128fe5df7e636d06d 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,6 +1,8 @@
 2000-11-28  Elliot Lee  <sopwith@redhat.com>
 
        * gdk/gdkregion-generic.c: Zap warning.
+       * modules/input/Makefile.am: Only build im-xim if USE_X11 is enabled
+       * gtk/gtkrc.c: s/strcpy/memcpy/ to save a few nanoseconds.
 
 2000-11-28  Alexander Larsson  <alla@lysator.liu.se>
 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b7e6bdd5c4ee9f3260012fca68edbeafeea2165f..3bf0bfd00fbe3d693f2b73e128fe5df7e636d06d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,6 +1,8 @@
 2000-11-28  Elliot Lee  <sopwith@redhat.com>
 
        * gdk/gdkregion-generic.c: Zap warning.
+       * modules/input/Makefile.am: Only build im-xim if USE_X11 is enabled
+       * gtk/gtkrc.c: s/strcpy/memcpy/ to save a few nanoseconds.
 
 2000-11-28  Alexander Larsson  <alla@lysator.liu.se>
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b7e6bdd5c4ee9f3260012fca68edbeafeea2165f..3bf0bfd00fbe3d693f2b73e128fe5df7e636d06d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,6 +1,8 @@
 2000-11-28  Elliot Lee  <sopwith@redhat.com>
 
        * gdk/gdkregion-generic.c: Zap warning.
+       * modules/input/Makefile.am: Only build im-xim if USE_X11 is enabled
+       * gtk/gtkrc.c: s/strcpy/memcpy/ to save a few nanoseconds.
 
 2000-11-28  Alexander Larsson  <alla@lysator.liu.se>
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b7e6bdd5c4ee9f3260012fca68edbeafeea2165f..3bf0bfd00fbe3d693f2b73e128fe5df7e636d06d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,6 +1,8 @@
 2000-11-28  Elliot Lee  <sopwith@redhat.com>
 
        * gdk/gdkregion-generic.c: Zap warning.
+       * modules/input/Makefile.am: Only build im-xim if USE_X11 is enabled
+       * gtk/gtkrc.c: s/strcpy/memcpy/ to save a few nanoseconds.
 
 2000-11-28  Alexander Larsson  <alla@lysator.liu.se>
 

diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index 65c5bc3c30ae7e699d672c521929a65180f6d68c..18ea5a6dbda36e33541135ad80fbf7afa589c845 100644 (file)
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -563,7 +563,7 @@ gtk_rc_get_default_files (void)
  
    if (only_digit)
      {
-       strcpy (retval, "iso");
+       memcpy (retval, "iso", 4);
        wp = retval + 3;
      }
    else

diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index 44745c0534461ecc6a57d15adb49054e959a6d19..725d4b4253c08d75bbeb934531ad5b5c79bb9898 100644 (file)
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@@ -33,8 +33,15 @@ LDADDS = @STRIP_BEGIN@                                       \
 @STRIP_END@
 
 moduledir = $(libdir)/gtk-2.0/$(GTK_VERSION)/immodules
-module_LTLIBRARIES = im-cyrillic-translit.la im-xim.la im-viqr.la im-thai-broken.la \
-                     im-inuktitut.la
+
+im_xim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module
+im_xim_la_SOURCES =            \
+       gtkimcontextxim.c       \
+       gtkimcontextxim.h       \
+       imxim.c
+if USE_X11
+IM_XIM_MODULE=im-xim.la 
+endif
 
 im_cyrillic_translit_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module
 im_cyrillic_translit_la_SOURCES = imcyrillic-translit.c
@@ -48,10 +55,5 @@ im_viqr_la_SOURCES = imviqr.c
 im_inuktitut_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module
 im_inuktitut_la_SOURCES = iminuktitut.c
 
-im_xim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module
-im_xim_la_SOURCES =            \
-       gtkimcontextxim.c       \
-       gtkimcontextxim.h       \
-       imxim.c
-
-
+module_LTLIBRARIES = im-cyrillic-translit.la $(IM_XIM_MODULE) im-viqr.la im-thai-broken.la \
+                     im-inuktitut.la